Improve which-key--format-and-replace

Do a better job with nil descriptions

diff --git a/which-key.el b/which-key.el
index 827261dfd837dadafa257e56732222b78ba3035c..89c046846f9fe6081edb897fb078a1b46a69e6cd 100644 (file)
--- a/which-key.el
+++ b/which-key.el
@@ -1632,9 +1632,11 @@ alists. Returns a list (key separator description)."
              (hl-face (which-key--highlight-face orig-desc))
              (key-binding (which-key--maybe-replace (cons keys orig-desc)))
              (final-desc (which-key--propertize-description
-                          (cdr key-binding) group local hl-face orig-desc))
-             (final-desc (which-key--maybe-add-docstring final-desc orig-desc))
-             (final-desc (which-key--truncate-description final-desc)))
+                          (cdr key-binding) group local hl-face orig-desc)))
+        (when final-desc
+          (setq final-desc
+                (which-key--truncate-description
+                 (which-key--maybe-add-docstring final-desc orig-desc))))
         (when (consp key-binding)
           (push
            (list (which-key--propertize-key